From: Gnus developers Date: Wed, 1 Feb 2012 09:00:42 +0000 (+0000) Subject: Merge change(s) made in Gnus no-gnus branch X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1002 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7a5203a58a02798d5f8c71ceadc1c6a9c02f3935;p=emacs.git Merge change(s) made in Gnus no-gnus branch 2012-01-31 Jim Meyering gnus-agent.el (gnus-agent-expire-unagentized-dirs): Correct a comment (insert "not") and hide nominally-doubled "to". --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c781cac0dc9..f88d32b6038 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2012-01-30 Philipp Haselwarter (tiny change) + + * gnus.texi (Agent Basics): Fix outdated description of + `gnus-agent-auto-agentize-methods'. + 2012-01-28 Andreas Schwab * cc-mode.texi: Always @defindex ss. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 70ff5e645a4..97e936fd48a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-01-31 Jim Meyering + + * gnus-agent.el (gnus-agent-expire-unagentized-dirs): + Correct a comment (insert "not") and hide nominally-doubled "to". + 2012-01-30 Philipp Haselwarter (tiny change) * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index d7308758862..5178220af8f 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -3618,7 +3618,7 @@ articles in every agentized group? ")) (setq r d d (directory-file-name d))) ;; if ANY ancestor was NOT in keep hash and - ;; it's already in to-remove, add it to + ;; it's not already in to-remove, add it to ;; to-remove. (if (and r (not (member r to-remove)))